Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 9 Jul 2010 01:02:18 +0000 (01:02 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 9 Jul 2010 01:02:18 +0000 (01:02 +0000)
commita885481e46364add097c7c5523176db5b87835ff
tree0477759329a0564c84376211c80372079b26db2e
parent46cffcff2a35513b0d5d882a80970552b878d7d5
parentabb48ec056c9f233713597ec38746eda828c428b
Merge from mainline.